Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:55:05 +0000 (22:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:55:05 +0000 (22:55 -0700)
commit4f197509c94825174c78c04d7ff95c9c0d667f07
treeef8f65994a5a1726b378205c772b0ccb5ab46dad
parent02c8e0398ad7719b4d50e89b8c6719cbdf7207ec
parent7ad6526f0ffd3a30a96b3db843a64c6a1c894c27
Merge from trunk.